lisp/ChangeLog: Remove merge markers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45c5fd52d9915d5c10020c077bdaaef7b3874712..578f5e4fb49df4297ed7bad2315dcf77ac7268bf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -73,7 +73,6 @@
        (ctext-no-compositions): Doc fix.
        (compound-text-with-extensions): Doc fix.
 
->>>>>>> MERGE-SOURCE
 2010-08-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * simple.el (exchange-dot-and-mark): Mark obsolete, finally.